Change to the newly-created folder. Fixes #138932. (trap_activate_cb):

2004-05-31  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkfilechooserdefault.c (renderer_edited_cb): Change to the
	newly-created folder.  Fixes #138932.
	(trap_activate_cb): Only return TRUE if we did handle the event.
	Fixes #143359; patch by jylefort@brutele.be.

diff --git a/ChangeLog b/ChangeLog
index d1dcfdbc312132b71069935c78169c6ff386afa6..e58d32058d2f38ce4742ff60dc973e2091618bca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-31  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (renderer_edited_cb): Change to the
+       newly-created folder.  Fixes #138932.
+       (trap_activate_cb): Only return TRUE if we did handle the event.
+       Fixes #143359; patch by jylefort@brutele.be.
+
 Mon May 31 02:39:32 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkimage.c (gtk_image_new_from_pixmap): Fix typo in 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d1dcfdbc312132b71069935c78169c6ff386afa6..e58d32058d2f38ce4742ff60dc973e2091618bca 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-05-31  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (renderer_edited_cb): Change to the
+       newly-created folder.  Fixes #138932.
+       (trap_activate_cb): Only return TRUE if we did handle the event.
+       Fixes #143359; patch by jylefort@brutele.be.
+
 Mon May 31 02:39:32 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkimage.c (gtk_image_new_from_pixmap): Fix typo in 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d1dcfdbc312132b71069935c78169c6ff386afa6..e58d32058d2f38ce4742ff60dc973e2091618bca 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-05-31  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (renderer_edited_cb): Change to the
+       newly-created folder.  Fixes #138932.
+       (trap_activate_cb): Only return TRUE if we did handle the event.
+       Fixes #143359; patch by jylefort@brutele.be.
+
 Mon May 31 02:39:32 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkimage.c (gtk_image_new_from_pixmap): Fix typo in 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d1dcfdbc312132b71069935c78169c6ff386afa6..e58d32058d2f38ce4742ff60dc973e2091618bca 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-05-31  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (renderer_edited_cb): Change to the
+       newly-created folder.  Fixes #138932.
+       (trap_activate_cb): Only return TRUE if we did handle the event.
+       Fixes #143359; patch by jylefort@brutele.be.
+
 Mon May 31 02:39:32 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkimage.c (gtk_image_new_from_pixmap): Fix typo in 

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 7f9b1c83b7208778f0a8f041cb052cbd9773f67a..b601e00be02e4ce4e958ff1e4e33b1c91fb42285 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1504,16 +1504,14 @@ renderer_edited_cb (GtkCellRendererText   *cell_renderer_text,
     }
 
   error = NULL;
-  if (!gtk_file_system_create_folder (impl->file_system, file_path, &error))
-    {
-      error_dialog (impl,
-                   _("Could not create folder %s:\n%s"),
-                   file_path, error);
-    }
+  if (gtk_file_system_create_folder (impl->file_system, file_path, &error))
+    change_folder_and_display_error (impl, file_path);
+  else
+    error_dialog (impl,
+                 _("Could not create folder %s:\n%s"),
+                 file_path, error);
 
   gtk_file_path_free (file_path);
-
-  /* FIXME: scroll to the new folder and select it */
 }
 
 /* Callback used from the text cell renderer when the new folder edition gets
@@ -2608,10 +2606,12 @@ trap_activate_cb (GtkWidget   *widget,
          && widget != window->default_widget
          && !(widget == window->focus_widget &&
               (!window->default_widget || !GTK_WIDGET_SENSITIVE (window->default_widget))))
-       gtk_window_activate_default (window);
-
-      return TRUE;
+       {
+         gtk_window_activate_default (window);
+         return TRUE;
+       }
     }
+
   return FALSE;
 }